From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 31 May 2013 15:47:48 +0000 (+0200)
Subject: dash: Make sure _clearDragPlaceholder() resets _dragPlaceholderPos
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4079
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4b95be6a95cbbb61ad4dc2d25a6695e44c2c8b73;p=gnome-shell.git

dash: Make sure _clearDragPlaceholder() resets _dragPlaceholderPos

The function currently only resets the placeholder position if
there is a placeholder; this is not necessarily true, as the
placeholder may be reset outside _clearDragPlaceholder().
If this happens, the placeholder will temporarily stop working
for the "old" position (and permanently if it's the only position).
Just reset the position unconditionally.

https://bugzilla.gnome.org/show_bug.cgi?id=684618
---

diff --git a/js/ui/dash.js b/js/ui/dash.js
index e29aff404..d6fd14cff 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -793,8 +793,8 @@ const Dash = new Lang.Class({
         if (this._dragPlaceholder) {
             this._dragPlaceholder.animateOutAndDestroy();
             this._dragPlaceholder = null;
-            this._dragPlaceholderPos = -1;
         }
+        this._dragPlaceholderPos = -1;
     },
 
     handleDragOver : function(source, actor, x, y, time) {